From f2bb9f1b6e738c3fc1a419cea7d973d542caf864 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 14 Aug 2009 08:22:34 +0100 Subject: [PATCH] x86: Do not clear EF.TF in crash-debug mode. Signed-off-by: Keir Fraser --- xen/arch/x86/traps.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 508cd9d306..8a066cc41c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3005,16 +3005,18 @@ asmlinkage void do_debug(struct cpu_user_regs *regs) void sysenter_eflags_saved(void); /* In SYSENTER entry path we can't zap TF until EFLAGS is saved. */ if ( (regs->rip >= (unsigned long)sysenter_entry) && - (regs->rip < (unsigned long)sysenter_eflags_saved) ) + (regs->rip <= (unsigned long)sysenter_eflags_saved) ) + { + if ( regs->rip == (unsigned long)sysenter_eflags_saved ) + regs->eflags &= ~EF_TF; goto out; - if ( (regs->rip != (unsigned long)sysenter_eflags_saved) && - !debugger_trap_fatal(TRAP_debug, regs) ) - WARN_ON(1); -#else + } +#endif if ( !debugger_trap_fatal(TRAP_debug, regs) ) + { WARN_ON(1); -#endif - regs->eflags &= ~EF_TF; + regs->eflags &= ~EF_TF; + } } else { -- 2.30.2